From ed0c52fedf604c3c6b994faf8973ed5c4ed57d22 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Sun, 28 Nov 2021 15:05:29 +0000
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 514963 -> 515682 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index b05d9772bcf..61a136129f9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -859,7 +859,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	offapi_idl \
 	udkapi_idl \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 	) \
 ))
diff --git a/configure.ac b/configure.ac
index 5d72effca94c447174f2fbf410daeb9468711185..b1a3301e414e842336b01c284d9c8b55bd46a10f 100644
GIT binary patch
delta 584
zcmZ8eO=}ZT6lI({`7*7f(X^?xc}8s-X`xa#E(RJ~X`LderV83lLu_8+q+urZy{QOY
z2rjx3g$QR`m+l0GY+UHB;KpAd^<(3I=)yPcRL~0t-n;kQbMAew+spm<n0xj?JGs`E
zU@BHxwXIs+TkpP;8LT9=Wb%n4A5Df?oU*my=<#LB)(T`PK2~k*LLp4Ex+7{2+gz|F
zcll;bI-bkC1}o1kvSV@<pKPs&k+L@ZSMB$zHkLb_!Je2nnkBHVhO*{UF6^BHTT?ip
zp!W`JYMxGUH!!Pu^^H6`Z!*`zZOgcf(V{+p_I)biy`X^zZwsD?<MSOOtq0q^NsZw9
zCQak*a-<)lg2vFgN`1H`=n^_DieXF8Sv<I5WO2=-RG^Z<hDmA61l6w<GVn{#AeKxc
zgSezC7@s%N*j+RFQQf6Ncj*kFv#7_g-%-NPB~4-9(xZ5}ty+7M&S7C)S-jdN!cR$)
zc-^9*?zeOd%qJ5wO=V;IlwAnEC5VQTh_j<b;>>pim&_{NE6tT>RbCZC&LJZ>|4V5&
zc;VCVkkeq23(4{q!{(cnc}r=iCmGED-;yZJRx5X}SC+>^auJW~l;7F&Nx@Kv^!EJd
G7ybwEakz;9

delta 229
zcmWN?y-UMD0ETfI-<a4Cdzco#3PEwT#6KW}pdi*kP!J(vTd<=b*j!I=5SMm8=nF1x
zb}8y0WN~m4!QEXP-F5Va-}8LEgt`c?pG)4!VA3iXmN8XKS~#jQKF1o99`^NB-DNw2
z&G#M})EO2S<R%{(=9uQFvy&s_@-eD>dPAA_IhN=(tTKhNd_LU3<#&!izm8|=OKk9W
z><B)N?3xz46-J5U^0p11cM=glB~~apsBpfIb^axm;AtOm&`b~0t-Z~igYBkSyn5Na
ZU^KL9JX4sVr?5DX3WjY=7g9Mt-G3K0On(3X

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 6477ad71e8c..c23343a027e 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated)
 ifneq ($(gb_SUPPRESS_TESTS),)
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 16eba69c3e3..0d5fca58d2c 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -42,8 +42,10 @@ endif
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 	GeneratedPackage_uno_loader_classes \
 ))
 endif
diff --git a/odk/util/check.pl b/odk/util/check.pl
index be03d40ff58..bed51e1c7a6 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -184,7 +184,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2